From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sun, 22 Mar 2026 19:00:57 +0000 (+0100)
Subject: cross
X-Git-Tag: archive/raspbian/6.10.2+dfsg-6+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de//%22style.css/%22/%22http:/www.example.com/%22mailto:kde%40ewsoftware.de/%22style.css/%22?a=commitdiff_plain;h=0d8d331676775a58c2fa375a694cef0fda7c7927;p=qt6-base.git

cross


Gbp-Pq: Name cross.patch
---

diff --git a/examples/sql/CMakeLists.txt b/examples/sql/CMakeLists.txt
index 06d7d532d..246771df0 100644
--- a/examples/sql/CMakeLists.txt
+++ b/examples/sql/CMakeLists.txt
@@ -15,6 +15,6 @@ if(TARGET Qt6::Xml)
     qt_internal_add_example(masterdetail)
 endif()
 
-if(NOT CMAKE_CROSSCOMPILING)
+if(QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING)
     qt_internal_add_example(sqlbrowser)
 endif()
diff --git a/src/tools/configure.cmake b/src/tools/configure.cmake
index f81882006..fa2b93e5a 100644
--- a/src/tools/configure.cmake
+++ b/src/tools/configure.cmake
@@ -9,7 +9,7 @@ qt_feature("androiddeployqt" PRIVATE
     SECTION "Deployment"
     LABEL "Android deployment tool"
     PURPOSE "The Android deployment tool automates the process of creating Android packages."
-    CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression AND QT_FEATURE_settings)
+    CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND QT_FEATURE_regularexpression)
 
 qt_feature("macdeployqt" PRIVATE
     SECTION "Deployment"